From: Kim F. Storm <storm@cua.dk>
Date: Fri, 16 Apr 2004 20:07:49 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~23157
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=494588bf331285bc24ab8ca92058482de25cd79c;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cbd5803637d..5a30b0a5583 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-17  Kim F. Storm  <storm@cua.dk>
+
+	* image.c (PNG_BG_COLOR_SHIFT): Remove.
+	(png_load): Fix calculation of transparent background color on X
+	and W32 platforms.
+
 2004-04-16  Juanma Barranquero  <lektu@terra.es>
 
 	* xdisp.c (try_scrolling): Make sure `scroll-conservatively' is